projects
/
cargo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1c58852
)
Fix #4135: if theres `include = [...]`, then dont prepopulate filelist via git
author
Felix S. Klock II
<pnkfelix@pnkfx.org>
Fri, 16 Jun 2017 15:54:44 +0000
(17:54 +0200)
committer
Felix S. Klock II
<pnkfelix@pnkfx.org>
Fri, 16 Jun 2017 15:59:41 +0000
(17:59 +0200)
src/cargo/sources/path.rs
patch
|
blob
|
history
diff --git
a/src/cargo/sources/path.rs
b/src/cargo/sources/path.rs
index cb9c2dde07d7ccda4b5c1e0b8358d904888c9d35..7a21713f49ace85f3bd13cd61677b8b03c5e1772 100644
(file)
--- a/
src/cargo/sources/path.rs
+++ b/
src/cargo/sources/path.rs
@@
-114,8
+114,11
@@
impl<'cfg> PathSource<'cfg> {
}
};
- if let Some(result) = self.discover_git_and_list_files(pkg, root, &mut filter) {
- return result;
+ // attempt git-prepopulate only if no `include` (rust-lang/cargo#4135)
+ if include.is_empty() {
+ if let Some(result) = self.discover_git_and_list_files(pkg, root, &mut filter) {
+ return result;
+ }
}
self.list_files_walk(pkg, &mut filter)